From 5403697aa236b82903de1661245d31c37c5d0ff8 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 9 Apr 2019 01:01:56 +0100 Subject: [PATCH] Revert "net: stmmac: Send TSO packets always from Queue 0" This reverts commit 496eaed7fe94df7202d7cbe37873f96bcdda375e, which was commit c5acdbee22a1b200dde07effd26fd1f649e9ab8a upstream. This introduces data races. Gbp-Pq: Topic bugfix/all Gbp-Pq: Name revert-net-stmmac-send-tso-packets-always-from-queue.patch --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 886176be818..8c3e228b1da 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3033,17 +3033,8 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) /* Manage oversized TCP frames for GMAC4 device */ if (skb_is_gso(skb) && priv->tso) { - if (skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) { - /* - * There is no way to determine the number of TSO - * capable Queues. Let's use always the Queue 0 - * because if TSO is supported then at least this - * one will be capable. - */ - skb_set_queue_mapping(skb, 0); - + if (skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) return stmmac_tso_xmit(skb, dev); - } } if (unlikely(stmmac_tx_avail(priv, queue) < nfrags + 1)) { -- 2.30.2